From 4a312423c1fdddd2c242a54a6432af5cea96d9a8 Mon Sep 17 00:00:00 2001 From: "kaf24@scramble.cl.cam.ac.uk" Date: Thu, 17 Feb 2005 11:53:11 +0000 Subject: [PATCH] bitkeeper revision 1.1217 (421485a7z8JARjjC9F7b0rTr-A1WOw) Ensure watchdog disabled during fatal-error handling. Signed-off-by: Keir Fraser --- xen/arch/x86/traps.c | 2 ++ xen/drivers/char/console.c | 1 + xen/include/xen/lib.h | 1 - 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 341b7b5dd1..36280de46c 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -108,6 +108,8 @@ asmlinkage void fatal_trap(int trapnr, struct xen_regs *regs) "machine check", "simd error" }; + watchdog_on = 0; + show_registers(regs); if ( trapnr == TRAP_page_fault ) diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index 9ddfa2e90a..a26f9d7121 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -598,6 +598,7 @@ void panic(const char *fmt, ...) debugtrace_dump(); + watchdog_on = 0; mdelay(5000); machine_restart(0); } diff --git a/xen/include/xen/lib.h b/xen/include/xen/lib.h index 8d26e0ddbe..c335a04d15 100644 --- a/xen/include/xen/lib.h +++ b/xen/include/xen/lib.h @@ -8,7 +8,6 @@ #define BUG() do { \ printk("BUG at %s:%d\n", __FILE__, __LINE__); \ - debugtrace_dump(); \ FORCE_CRASH(); \ } while ( 0 ) -- 2.30.2